Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 12 May 2010 02:08:23 +0000 (02:08 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 12 May 2010 02:08:23 +0000 (02:08 +0000)

Trivial merge